More plugin-bridge work