added support for bridge-server