Updated to include new blocks in 1.7.