Add experimental rewrite rules