Code simplification (less methods in the core DAO)