Moved data handling into helper class