Rewrite fields