Improved versioning once again