Add uploaded-template and time-template