Change pretty much everything to work for AndroidTracker