Add inifile; fixes for nested structures