Added framework for eventhandler