Added proxies and reference classes