Add BOM and CPL