Small data synch refactor