Compatible with 0.6.0