Improve Interface detection for proper count