Changed the domain structure to match the D3S' one