Added support for non entity fields