Migration for the last commit
Improvements to Collection templates
Clarified some interactions in Datapoint templates