Adjusted data model to match output of blockparser