Refactor code to match this week's Schema & REST API.