Update Entity, Model
Bump Version
merged from Vinh