Make more RESTful