Migration to 0.24