design update. mandatory and optional Questions supported