Add DataService
Fixed memory leaks