Start to use new Config class inside build method
Make config class handle more of the configuration