added support for stored fields