Naive: Add support for 2D block as well