Refactoring to work with latest version of vundle