Added Eventhandler and submodule