Add better support to neovim