Improved support for multiple attacks.
Not finished