Added teamwork-system models
Merge