Add Machismo and Attributor