Updated text parser