Configuration overhaul