Added support for custom block parsing