Entity updates and basic end to end functions