Added support for other pages