Improve config part 2