Updated FakeDatabase