Updates to entity_sync_pull and entity_sync_yaml