#76 further changes for REST support