Updated to fix field type display