Updated DataService & Added documentation