Add count of data slice and other change