Make compatible with CM build