All proxies moved to models