0.6.0 compatability