Small refactor entities and DAO