Added CID and public fields to models