Added support for generation size