@ohadlevy, yes, I can look into a better way that distinguishes between v1 and v2