Add handling for text