Add better bindings