Added CustomerType logic