Minimal changes and DB updates