Added events handler