Add comment
Improve config file structure