Addibg commnent.
Improve the entity validation.