No more need for companyId and userId