Added class to handle groups.