Moved back to having everything in global namespace