Updated data handling.