Pulled groupManagement from develop (simplePlugin version)