Added support for text