Small changes to the data layer