Replaced all ValidEnity with IsValid