Current version still need to utilize the proxy module