Added table and entity validation checks.