Small changes
Service and client