Updated Controllers and add Service Clients