Updates to help with additional obfuscation