Correct use of normalization
Add general support for updates