Refactor for the new Nvim plugin specification