Updated Block handling