Update wrapper, add self check.