Added support for the active page