update with new endpoints
switch from service to class