Further optimizing of configuration chapter