Properly propogate the versioning everywhere