Rewrite REST API for 1.3