Updated generator for figaro