Improved the way default values are loaded