improve config structure