Implement proxies as proper methods and remove __call