Moved service to use work objects from lib