Be more flexible, support new infrastructure.