remove accountId and use service identifier