Final touches for config