Add support for page size