Add Blocks management; Fix empty missing_blocks issue