Changed to act RESTful