Updates to ANOVA and Options framework