Move to data.table