Modified skeleton to work with RESTful API