Updates to use figaro