Added compatiblity for x10dev and removed it for Circuit classes