updated data model

Updated for easier access to data in template