Added support for null fields