Add format-id
Fix cluster handling
Fix example