Added additional rewrite rules