Update defaults handling