Added support for easy page resolving