Add text support
Merge with new repo