Modified ng DataService to support new API