Added type int and fieldsets up to 8 parameters