Updates and Add Toro support