Adapt marketplace implementation to fastrouting