Moving return options to builder