Refactored DefaultsParser