Proxy pattern added