Removed compatibility functions from service and updated to current API functions