Update for Imagine 0.6>