Added CM 'otapackage' & 'bacon' support