Add Scorpion Support