Added default value handling.