Prototype: Add initial client routing support