Rewrite of Android support using V2.0 design