Adding support for CM5