Add additional fields to sync, tweaks to wrapper