Add 'immediate' and 'mandatory' options.