Prepare for 0.5