Added data values to the BlockType methods and used those in a few places.