DataService was added.
Client side refactoring.