working on DEVKIT-406, improvements for fields support