Rewrite data model for easier access and display