refactoring
refactoring
draft of SourceOfChangeEvents
constant instead of null
use SourceOfChangeEvents