improve manager structures