Update calls from attributes to using the fields on the REST api