Added templates for Action and Match