Move updateFeature, switchFeature into Util factory.