Changes to how to JS templates works