Modify internal APIs to static