FakeDataService refactored