Adding more Android < 3.0 support