Added cigar support