NX-493: Refactored internals and groups