Added support for page-size and content