Updates for Mirage 1.0