Fix dataHelper part complete