Enhancement/80/cmapi