Finalised primitives changes.