Added in the proxy pattern