Improved the default fields