Added Pickup and Powerup classes