Add tornado support