Added Entity and Item classes