Better support for Android 3+