Adding some stuff for vim bindings