Add overloads to attempt to avoid obfuscation issues