2.0.0 compatibility