Enhancements on text and added the module