Support for customer

Changes