Updating the messages per API spec, adding the relationships, untested