updates to entities and Matter persistence