Add functionility for namelist and diagnostics handling