Added vim and sh support