auto_sync structure refactor