data model, yaml, collaboration fix