Some tweaks, use config for Obfuscator