Refactor native versioning