Refactored .group classes.