Improve analytics problem