added multiserver support