Added some implmentation for Service and API