Update Entity, Model, Config
merged