Improve Android metrics