1. Refactored Binding class
2. Implemented macro binding