Add support for new blocks in 1.8 pre-release