Adapt to new infrastructure