Added group classes and interfaces.