towards multi-server support