Make the API make a little more sense