Beginning of "Update-unit class" refactoring