Several improvements to page API