Added field mapping ui