Cleaned up data access portions of the models