Refactored to new versioning system