Changes to AttackObject and CharacterObject