Added new combat features