Reflecting better the organization structure