Improved Pages API, Core and Module