Added on data event + handler