Simplifying the data layer