Add initial support for entity prediction and server reconciliation