Now compatible with new wires syntax