Updated config file with better structure