Enhance settings
 - to support multiple sections