Added full attack-attributes support