More changes to support the page layout domain