Add support for activities with an alternate hierarchy