Revise logic for finding existing model entry, or building new one,  version bump