Migration to 0.9