Updates to data structuring and filtering.