Before refactorin of Event

Change-Id: Ie3cc27578b427fe52d66a7031d5310e1bd53db2f
Change-Id: Ibd86d5f6d592ef494f604a5897d8d8aa920c3a05