Changes to match the new D3S' structures