Pull group modifications

Pulling group modifications to my branch, (as i'm working on some modifications that don't concern with the plugin as it was intended