Updated receiver to work with the new data model