Added rewrite and map instrictions