Merge "Some rework around DAO classes"