CFY-999 Updated plugin template with new types