update imports for common.fields