Adding support for API level 8 and higher