SFS-2591

Added a couple of events along with source / destination decorator support.