Added proper templates for abilities