Updated Entity validators as per mc's suggestion.