Improve sync (complexity reduction)