Moved all heirachy updates into message handlers