Changed ApiService implementation