Add extra attributes and update models

Ensure data load passes validations in latest version of models. Set dataset on measure so they are properly stored.