Refactored vo structure