Refactored bindings to add shortcuts