Modify Client model, change template names and constant file it's added