DAO grooming, mapping and TodoGroup changes