Added support for page origin