Change data struct