Modify dynamic UNL handling