Changed notification pattern to delegate pattern.
Merge branch 'feature/bandedo/delegation-refactor' into develop