[WIP] Implement sync support