Updated options to make use of feature switches