added extra user and team functionality