Added support for additional users groups