Refactored DataService to Portable Project