Compatibility rewrite