Adding Analytics support.