Changed all Text to String in datatypes