Adding support for 'Basic Mode'.