Massive overhaul and Mist support