Make it run and add an object for clarity

Prior to this change some API calls were broken.