Added support for Android 2.2 along with more items