Better block helpers handling