Update dying logic to use data model