Tristan updated templates to better reflect models