Update for Mimosa 2.0