Add compatibility with new Vundle