Started conversion of customers classes #164