Added support for fields