Added group fields to shapeFamily and shape entities