Resolve #12 - Proxy