Updated feature: Get rid of Text dependence