Added support for multiple blocks