Added wrapper for the CM/B2G compatibility