Added support for training groups