Fix cid refactorying