Add config support part 1/2