-Replace certain fields with custom properties