Added CID security check to all options