Better block handling