NX-493: More refactoring

Paving the way to simplify group support