Roaster and RoasterGenerator update