New and Improved, Now with Data Model