Add some convenience to the API