Added changes to work with amazon vim improvement