Changes to add customer-service association functionality