Added Analytics support