Added torch support