Modify data struct to prepare for validation