Added templates that I forgot in the last commit