Update to harden external facing interfaces