updates to secret token architecture