Updated base analytics