Restructuring the model layer to make it easier