Add poncho and extract to classes