More JSLink changes
More JSLink changes