Updates to the api to be more consistent