Preparation for new version of Google Analytics