Fixed generation, blocks and registry