Simplified the versioning stuff