Moving towards a more rc-like config