Should Shape be added to the dictionary?