Add Proxy and Builder patterns