Refitting to work with 0.6.0.