Completely removed Entities, changed to DAOs