Adds missing templates and files from previous commit