Tried to make design more RESTful.