Add CM10.1 support