Updates for Primitive use