Added more vim support.