Handle new combined format