Updated wiremap