Popsi and Drink classes added