Converted service functions to return promises