Added Task and Grading, updated archetype part.