More fields checked for cid generation. Validation debug.