Versioning improvements