Updated config with some comments