Updated World Battle and Unit Manager