Updated string handling