added basic support for fields