Before moving primitives to one global dictionary