Updating most relationships to primitives