[RJA-1953][feature] - Modify domain objects to support template links