Added support for pages generator