Added factory for team stuff