Adding more interesting classes