Added Block and Item class