added client and entity concepts