Further work in upload templates