Add class Goat