Refactoring API.. Moved out of service