Changed (updated) Indicator/Type to allow for specifying multiple types