Revised X10 support