Use VersionUtils where appropriate