Added Obstacle and Item classes