Step 1 of 0.6.0 compatibility