Add wire support back in