Better handling of data.