X10 Bridge: refactored