0.5.0 compatibility