Modified regexp to allow dataset with dashes. Add event Based splitting. CAF-136