Fix and add more generic tempaltes for upload