Update with first version of KeyBindingInterceptor