Improve config class