Get services improvements

issue #69