Updates for chapter 7 (creating API layer)