Rewrite of datafields to standard db fields