Rework API to be more natural with multiple section support
Use isset, instead of is_null for robustness