Adding support for manual rewrites