Updated string class