Updates to data model et. al.