Changed properties from string to Text