Remove @Nullable from methods which require companyId