Add support for block layout