Added page variable support and perhaps page part support too