Add compatibility with cm