Added support for pages/ templates