DisCSP class changes