Use the improved API for blocks