Use accounts instead of device ids