enhanced entity validation