Added support for group sizes