Added support for page templates