Yet another round of configuration enhancement