Better string handling