fixed #14 updated rest service and client to reflect new data model