refactoring to better handle new VEP endpoints