Refactor Config [WIP]