Added cookie store and support for saving the pointsSource.