Updated Data Model to match RptPutty