Update to support new auth system