Added rewrite additions