Reworks Config as data structures