adding cid tracking to models that need it