Added support for page numbering