Added Entity Checks