Added more flexbility for enable/disable per-page