Added support for field name constants