Change model extendedGrant signature + passthrough errors correctly