For backward-compatibility, option expertMode in add