Update entities
Manual merge