More work on registry for blocks