V2x refactoring