Move to auth version 2