Modify necessary functions to be static