updated entity service and client