0.7.0 compatibility