+ added support for nil fields