Refactored VO conversion