Added Rewrite for API