Add shape variables