Better text expansion