Adding rewrite changes