added field dictionary and named constants to facilitate lookup