Customer model changes as per coding standards