Kind of added entity list switching