Mage console updates (work in progress)