Adding support for 'Master Passcode' approach