improve defaults support