Updates for Mirage API changes