Improved enemy management