Added 0.9.0 compatibility