[Update] more submission fields and templates