Add prim and aux data structures