Fix a conflict with the system bindings
Overhaul and streamline