Better handeling of data.