Expansion management