Added extra field type parameters based on field name