Added more support for recent feature rollout.