WirePattern updates for 0.5.8