Added BlockType and ItemType