Added CID support