Added support for field type