Add text support in mapper