Implement improved sync from 5.0 version