Make it 0.9.0 compliant