Add bases functionality and TeamManager