Compatibility with the latest analytics version