Group selectors support + refactoring