Common: Switch to scorpion optimization