Added client context to services