Added support for N blocks