Making the API look a lot nicer