Minor update to config layout to support environment switching.