Added functioning version of the service