Added entity details and str