Updated to fit global namespace