Add better bindings, trim plugins