More plugin bridge work