added support for all fields