Added getEntities and fixed list.