Change Blocks to BlockType, improvements