Added to Entity value types and added a response call check.