Adding support for Android 2.1+ (To be tested)