PLF-5399 : Improve performances by not using OrganizationService