Added eventhandler etc