Further changes relating to API and page handling