improve the entity validator, some stuff is really required