0.9.0.0 compatibility changes