Extensive config changes