More config overhaul. No more caps