Rework config object