Block-ID & Metadata based machine types, preparing for RI merge