Made CPE Metadata more tolerant