Updated underscore templates