Add new model of class for more modularity