Adding Analytics, fixes #8