Refactor Team import