Implemented field names instead of key

Raw implementation. It could be better.