Add common CM stuff