Add subsetting
Update data_structures