Added support for extended block data