More work on FakeAPI server