adapted to new entities endpoint