Massive improvement to config reliability