More differentiated handling of default values