Issue #6: Improve synchronization buffer