Added Block and Item classes