Added debugging options to verify CDF