Add additional indexes to improve analytics reporting performance