Update structure , Managers need fix