Add a bunch of sugar to the API