Add new model of class for more modularity
Add new model of class for more modularity