v0.6.0 compatibility
0.4.0