switched to group-based methods
fixes for groups + more specific naming
Merge branch 'feature/backends' into develop