Better default value handling