Feature/group dao