Added support for linked properties and removed case option from string generator