Feature 5945 Adding WIM to NBI