Changed approach for global event hanling for our app