0.90 Compatibility update