Improve team functions

Signed-off-by: Tyler Menezes <tylermenezes@gmail.com>