Added support for field codes