Added Text to the library, refactored.