Added the start of config support