Renaming the model classes and adding some DAOs