Rewrite for browser
Add DSL