Added versioning check