Add support for Blocks
v1.4.0