Added support for named fields