Refactor for full 1 way sync support