Switch from using Strings internally to Text