Many changes. Supports new blocks.