Continuing the support of the rewrites mode