Refactored version creation