Builder rework of options