API Changes

Finish implementing API changes for Team