More thread-safety concerns and combat handler class