Updating data models; refactoring pages and URLs