replaced agent concept with entities