Updated to include the Teams Entity (#1)