removed CustomerServiceEndpoint and made annotational changes