Implemented new versioning system