Added DEXSPY support