Make some modifications to the API to make bindings easier