Added support for toro