Updated to be a global module