Code review fixes. Reviewed by @nbeloglazov.
Another code review modifications. Reviewed by @nbeloglazov.
User macro can be used to attach user to multiple groups.