Improvements to Attack field