Simplified Config a bit