Support for new ma:wizard behaviour