Add support for vim style key