Improved field data mapping
Bump to 1.2.2