Changed the implementation of the service client to a single instance overall