Refactor: Remove repeated code
Everything now happens through well-structured proxies