Update to current Trust interface