Added support for modular pages