Added features to use it for CM9 and CM10