More auth; removed connect-roles