Changes to match the new D3S's structure of the codelists