Expands defense handling a bit