added more TextProperty support