Add 3.0 compatibility