Fix entity validation attributes
Upgrade version