Make compatible with 0.6.0