Add class rewrite compatibility with Avatax