Updated to latest BridgeDb refactoring