More work on WiresBuilder