Some rework around DAO classes