Improve - Fold all entries when synchronization is done
Doc - Improve comments