Updating TODO with all the missing bindings