Moving InMemoryMarkerDataSource to client