Modifications according to new SAREF core Closes #7, #18, #19, #16, #11, #17, #14, and #15 See merge request !13
