Added base files and proxies