Stop cluttering global namespace and support debugger