Split into bundles
Better android support