Updating more Block clases for 1.7