Added support for page function