[aphrodite] Improve Analytics