Updates to work with cigar-server