Change funcionality to organizationService