Variables and domains now include 5 options by default, and add 3 additional options when more options are requested