MOB-149 - nicer way to set options.