Making a better data structure