Improve config option passing