Implemented TODOs and fixed bindings extension