Changed the API signature to be a bit more RESTful