Finish re-implementing ConfigBuilder