rewrite support updates