Add RegistryID from mc-dev for diff visibility.
Use map for block lookups to avoid bounds checks